Joakim Verona [Fri, 21 Dec 2012 19:42:09 +0000 (20:42 +0100)]
auto upstream
Glenn Morris [Fri, 21 Dec 2012 19:32:43 +0000 (11:32 -0800)]
Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org
Glenn Morris [Fri, 21 Dec 2012 19:16:15 +0000 (11:16 -0800)]
No need to mention generated files in ChangeLogs
(at least there should be no blank line separating this from the
actual change)
Glenn Morris [Fri, 21 Dec 2012 19:08:32 +0000 (11:08 -0800)]
* doc/emacs/emacs-xtra.texi (copying): The FSF does not sell copies of this.
Simply include doclicense.
Glenn Morris [Fri, 21 Dec 2012 19:01:24 +0000 (11:01 -0800)]
May as well just include doclicense.texi in all doc/misc manuals
Glenn Morris [Fri, 21 Dec 2012 18:55:16 +0000 (10:55 -0800)]
Include a copy of GFDL, which @copying says is included
Glenn Morris [Fri, 21 Dec 2012 18:36:41 +0000 (10:36 -0800)]
Don't say "buying copies from the FSF" for manuals they do not publish
Ref "License Notices for Documentation" in maintain.info
Glenn Morris [Fri, 21 Dec 2012 18:14:29 +0000 (10:14 -0800)]
* doc/misc/erc.texi: No need to include gpl in this small manual.
Eli Zaretskii [Fri, 21 Dec 2012 11:52:18 +0000 (13:52 +0200)]
src/fileio.c (Finsert_file_contents): Doc fix.
Eli Zaretskii [Fri, 21 Dec 2012 11:21:35 +0000 (13:21 +0200)]
Possibly fix bug #13086 with losing track of subprocesses on MS-Windows.
src/w32proc.c (new_child, delete_child, find_child_pid): For a
subprocess, consider its slot being in use as long as its process
handle (procinfo.hProcess) is not NULL. This avoids reusing the
slot when a new process is started immediately after killing
another one, without waiting enough time for the first process to
be reaped and resources allocated for it be orderly freed.
Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
Joakim Verona [Fri, 21 Dec 2012 08:16:13 +0000 (09:16 +0100)]
auto upstream
Michael Albinus [Fri, 21 Dec 2012 08:10:26 +0000 (09:10 +0100)]
* simple.el (process-file): Overwrite stderr file, if exists.
Chong Yidong [Fri, 21 Dec 2012 08:04:27 +0000 (16:04 +0800)]
* buffer.c (Fset_buffer_major_mode): Doc fix.
Fixes: debbugs:13231
Joakim Verona [Fri, 21 Dec 2012 08:01:26 +0000 (09:01 +0100)]
auto upstream
Chong Yidong [Fri, 21 Dec 2012 07:56:47 +0000 (15:56 +0800)]
* modes.texi (Auto Major Mode): Fix typo.
Fixes: debbugs:13230
Chong Yidong [Fri, 21 Dec 2012 07:51:33 +0000 (15:51 +0800)]
Make read-char-by-name signal an error for invalid input.
* international/mule-cmds.el (read-char-by-name): Signal an error
if the user does not supply a valid character.
* editfns.c (Finsert_char): Since read-char-by-name now signals an
error for invalid chars, don't check for a nil return value.
Fixes: debbugs:13177
Joakim Verona [Fri, 21 Dec 2012 07:46:09 +0000 (08:46 +0100)]
auto upstream
Daiki Ueno [Fri, 21 Dec 2012 07:35:02 +0000 (16:35 +0900)]
* epg.el (epg-error): Set `error-message' property.
Joakim Verona [Fri, 21 Dec 2012 07:31:20 +0000 (08:31 +0100)]
auto upstream
Daiki Ueno [Fri, 21 Dec 2012 07:21:35 +0000 (16:21 +0900)]
* epg.el (epg--start): Print GPG_AGENT_INFO in the debug buffer.
Joakim Verona [Fri, 21 Dec 2012 05:50:54 +0000 (06:50 +0100)]
auto upstream
Chong Yidong [Fri, 21 Dec 2012 05:42:59 +0000 (13:42 +0800)]
* simple.el (transpose-subr-1): Preserve marker positions
by changing the insertion sequence.
Fixes: debbugs:13122
Joakim Verona [Fri, 21 Dec 2012 03:56:09 +0000 (04:56 +0100)]
auto upstream
Kelly Dean [Fri, 21 Dec 2012 03:49:28 +0000 (11:49 +0800)]
* simple.el (kill-region): Deactivate mark even for empty regions. (tiny change)
Fixes: debbugs:13169
Joakim Verona [Fri, 21 Dec 2012 03:46:14 +0000 (04:46 +0100)]
auto upstream
Chong Yidong [Fri, 21 Dec 2012 03:37:02 +0000 (11:37 +0800)]
* help-fns.el (describe-variable): Make sure we get the right buffer name.
Suggested by Kelly Dean.
Fixes: debbugs:13105
Chong Yidong [Fri, 21 Dec 2012 03:17:57 +0000 (11:17 +0800)]
* sort.el (sort-subr): Doc fix.
Fixes: debbugs:13056
Chong Yidong [Fri, 21 Dec 2012 03:04:38 +0000 (11:04 +0800)]
* frames.texi (Mouse Commands): Fix description of the effect of mouse dragging.
Fixes: debbugs:13049
Chong Yidong [Fri, 21 Dec 2012 02:56:18 +0000 (10:56 +0800)]
* customize.texi (Simple Types): Document key-sequence type.
Fixes: debbugs:13048
Joakim Verona [Fri, 21 Dec 2012 02:15:59 +0000 (03:15 +0100)]
auto upstream
Michael Mauger [Fri, 21 Dec 2012 02:08:29 +0000 (21:08 -0500)]
* comint.el (comint-redirect-previous-input-string): New variable.
(comint-redirect-setup, comint-redirect-cleanup)
(comint-redirect-preoutput-filter): Use it. Fixes redirection bug.
(comint-redirect-preoutput-filter): Fix verbose message.
Joakim Verona [Thu, 20 Dec 2012 16:21:55 +0000 (17:21 +0100)]
auto upstream
Dmitry Antipov [Thu, 20 Dec 2012 16:09:05 +0000 (20:09 +0400)]
Avoid calls to CHAR_TO_BYTE if byte position is known.
* editfns.c (make_buffer_string_both): Use move_gap_both.
(Fbuffer_string): Use make_buffer_string_both.
* marker.c (buf_charpos_to_bytepos): Convert to eassert.
Adjust comment.
(buf_bytepos_to_charpos): Likewise.
(charpos_to_bytepos): Remove.
* fileio.c (Finsert_file_contents): Use move_gap_both.
* search.c (Freplace_match): Likewise.
* process.c (process_send_region): Likewise. Use convenient
names for byte positions.
* lisp.h (charpos_to_bytepos): Remove prototype.
* indent.c (scan_for_column): Use CHAR_TO_BYTE.
* insdel.c (move_gap): Likewise.
Joakim Verona [Thu, 20 Dec 2012 15:06:35 +0000 (16:06 +0100)]
auto upstream
Paul Eggert [Thu, 20 Dec 2012 14:57:40 +0000 (06:57 -0800)]
* xdisp.c (redisplay_internal): Remove now-unused local.
Joakim Verona [Thu, 20 Dec 2012 14:12:08 +0000 (15:12 +0100)]
auto upstream
Joakim Verona [Thu, 20 Dec 2012 14:06:16 +0000 (15:06 +0100)]
auto upstream
Stefan Monnier [Thu, 20 Dec 2012 14:03:34 +0000 (09:03 -0500)]
* src/xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove.
(redisplay_internal): Don't bother selecting the frame to get the
proper value of frame-local variables.
Michael Albinus [Thu, 20 Dec 2012 13:15:43 +0000 (14:15 +0100)]
* ob.el (org-babel-temp-file): Fix setting of
`temporary-file-directory' on remote hosts.
* ob-eval.el (org-babel-shell-command-on-region): Use
`process-file' instead of `call-process-region'. The latter one
does not work on remote hosts.
Michael Albinus [Thu, 20 Dec 2012 11:15:38 +0000 (12:15 +0100)]
* progmodes/grep.el (rgrep): Escape command line. Sometimes, it
is too long for Tramp. See discussion in
<http://thread.gmane.org/gmane.emacs.tramp/8233/focus=8244>.
* progmodes/compile.el (compilation-start): Remove line escape template.
Joakim Verona [Thu, 20 Dec 2012 08:56:15 +0000 (09:56 +0100)]
auto upstream
Dmitry Antipov [Thu, 20 Dec 2012 08:49:21 +0000 (12:49 +0400)]
* textprop.c (set_text_properties_1): Do not allow NULL interval.
Rename 4th argument since it may be buffer or string. Adjust comment.
* intervals.c (graft_intervals_info_buffer): Find an interval here.
Bastien Guerry [Thu, 20 Dec 2012 08:18:23 +0000 (09:18 +0100)]
Fix typos.
Akinori MUSHA [Thu, 20 Dec 2012 07:56:56 +0000 (23:56 -0800)]
* Makefile.in (install-arch-dep): Ignore chmod errors (tiny change)
Fixes: debbugs:13233
Joakim Verona [Thu, 20 Dec 2012 05:10:52 +0000 (06:10 +0100)]
auto upstream
Dmitry Antipov [Thu, 20 Dec 2012 05:05:41 +0000 (09:05 +0400)]
* vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
Adjust comment.
Joakim Verona [Wed, 19 Dec 2012 21:36:08 +0000 (22:36 +0100)]
auto upstream
Michael Albinus [Wed, 19 Dec 2012 21:32:56 +0000 (22:32 +0100)]
* NEWS: Tramp implements `file-acl' and `set-file-acl'.
Michael Albinus [Wed, 19 Dec 2012 21:25:58 +0000 (22:25 +0100)]
* files.texi (Magic File Names): Add `file-acl',
`file-selinux-context', `set-file-acl' and
`set-file-selinux-context'. Make the list consistent.
Joakim Verona [Wed, 19 Dec 2012 20:50:52 +0000 (21:50 +0100)]
auto upstream
Tassilo Horn [Wed, 19 Dec 2012 20:40:50 +0000 (21:40 +0100)]
* themes/tsdh-dark-theme.el (tsdh-dark): Add customizations of
many new faces.
Joakim Verona [Wed, 19 Dec 2012 20:01:14 +0000 (21:01 +0100)]
auto upstream
Jonas Bernoulli [Wed, 19 Dec 2012 19:51:40 +0000 (14:51 -0500)]
* lisp/emacs-lisp/lisp-mnt.el (lm-section-end): Always end before the
following non-comment text.
(lm-header-multiline): Continuation lines need to be indented more than
the first line.
(lm-homepage): New function.
(lm-with-file): Don't be confused if narrowing is in effect.
* doc/lispref/tips.texi (Library Headers): New header keyword `Homepage'.
Make continuation lines syntax more precise.
Fixes: debbugs:13207
Joakim Verona [Wed, 19 Dec 2012 19:51:15 +0000 (20:51 +0100)]
auto upstream
Stefan Monnier [Wed, 19 Dec 2012 19:41:43 +0000 (14:41 -0500)]
* lisp/vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the
very beginning of a hunk (e.g. killing the first line).
Joakim Verona [Wed, 19 Dec 2012 16:02:20 +0000 (17:02 +0100)]
auto upstream
Dmitry Antipov [Wed, 19 Dec 2012 15:52:48 +0000 (19:52 +0400)]
* coding.c (Fdetect_coding_region): Do not check start and end with
CHECK_NUMBER_COERCE_MARKER since validate_region does that itself.
(code_convert_region): Likewise.
Joakim Verona [Wed, 19 Dec 2012 14:07:20 +0000 (15:07 +0100)]
auto upstream
Paul Eggert [Wed, 19 Dec 2012 13:56:49 +0000 (05:56 -0800)]
Spelling fix.
Joakim Verona [Wed, 19 Dec 2012 13:11:26 +0000 (14:11 +0100)]
auto upstream
Michael Albinus [Wed, 19 Dec 2012 13:01:16 +0000 (14:01 +0100)]
* net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines
and text properties from returned ACL string.
(tramp-sh-handle-set-file-acl): Do not use additional parentheses
for "setfacl" command.
Joakim Verona [Tue, 18 Dec 2012 19:16:38 +0000 (20:16 +0100)]
auto upstream
Eli Zaretskii [Tue, 18 Dec 2012 19:05:56 +0000 (21:05 +0200)]
Follow symlinks in MS-Windows emulations of ACL functions.
src/w32.c (acl_get_file, acl_set_file): Run the file name through
map_w32_filename, and resolve any symlinks in the file name, like
Posix platforms do.
(acl_set_file): Call revert_to_self, if any privileges were
enabled.
Joakim Verona [Tue, 18 Dec 2012 13:48:03 +0000 (14:48 +0100)]
auto upstream
Michael Albinus [Tue, 18 Dec 2012 13:37:06 +0000 (14:37 +0100)]
* net/tramp.el (tramp-error-with-buffer): Give a hint to use
`tramp-cleanup-this-connection', when the process has died.
(Bug#13151)
Glenn Morris [Tue, 18 Dec 2012 08:32:46 +0000 (00:32 -0800)]
Simply refer to main file semantic.texi for copying conditions
(rather than stating a slightly different set of conditions).
This is consistent with eg doc/emacs/*.texi.
Joakim Verona [Mon, 17 Dec 2012 21:06:12 +0000 (22:06 +0100)]
auto upstream
Juanma Barranquero [Mon, 17 Dec 2012 20:59:04 +0000 (21:59 +0100)]
src/makefile.w32-in: Update depencencies.
Juanma Barranquero [Mon, 17 Dec 2012 20:58:12 +0000 (21:58 +0100)]
nt/config.nt: Sync with autogen/config.in.
(BSD4_2): Remove.
Joakim Verona [Mon, 17 Dec 2012 19:51:40 +0000 (20:51 +0100)]
auto upstream
Stefan Monnier [Mon, 17 Dec 2012 19:43:55 +0000 (14:43 -0500)]
* lisp/icomplete.el (icomplete-completions): Also use … to truncate prefix.
Joakim Verona [Mon, 17 Dec 2012 19:26:49 +0000 (20:26 +0100)]
auto upstream
Stefan Monnier [Mon, 17 Dec 2012 19:17:06 +0000 (14:17 -0500)]
* src/xdisp.c (select_frame_for_redisplay): Use select_window_1 to
propagate redisplay's scrolling (if any) to the right window.
(redisplay_internal): Use ensure_selected_frame.
(display_mode_lines): Complete last fix.
* src/window.c (select_window_1): New func, extracted from select_window.
(select_window): Use it.
* src/window.h (select_window_1): Declare.
Eli Zaretskii [Mon, 17 Dec 2012 19:14:34 +0000 (21:14 +0200)]
Support Posix ACL APIs on MS-Windows.
src/w32.c: Include sddl.h and sys/acl.h.
(SDDL_REVISION_1): Define if not already defined.
(g_b_init_get_security_descriptor_dacl)
(g_b_init_convert_sd_to_sddl, g_b_init_convert_sddl_to_sd)
(g_b_init_is_valid_security_descriptor)
(g_b_init_set_file_security): New static flags.
(globals_of_w32): Initialize them to zero.
(SetFileSecurity_Name): New string constant.
(SetFileSecurity_Proc, GetSecurityDescriptorDacl_Proc)
(ConvertStringSecurityDescriptorToSecurityDescriptor_Proc)
(ConvertSecurityDescriptorToStringSecurityDescriptor_Proc)
(IsValidSecurityDescriptor_Proc): New typedefs.
(get_file_security, get_security_descriptor_owner)
(get_security_descriptor_group): Set errno to ENOTSUP.
(set_file_security, get_security_descriptor_dacl)
(is_valid_security_descriptor, convert_sd_to_sddl)
(convert_sddl_to_sd, acl_valid, acl_to_text, acl_from_text)
(acl_free, acl_get_file, acl_set_file): New functions.
src/fileio.c (Fcopy_file) [WINDOWSNT]: Support copying ACLs.
nt/inc/sys/acl.h: New file.
nt/inc/ms-w32.h (ENOTSUP): Define if undefined.
nt/config.nt (HAVE_POSIX_ACL): Define.
doc/lispref/files.texi (File Attributes, Changing Files): Update to include
MS-Windows support for ACLs.
Joakim Verona [Mon, 17 Dec 2012 18:01:06 +0000 (19:01 +0100)]
auto upstream
Paul Eggert [Mon, 17 Dec 2012 17:51:25 +0000 (09:51 -0800)]
Don't reraise SIGCHLD, as that can now lose.
With the 2012-12-03 fix for Bug#12980 in place, an old workaround
for some of that bug's symptoms can now cause Emacs to abort.
Remove the workaround.
* process.c (wait_reading_process_output): Don't reraise SIGCHLD.
The bug that caused SIGCHLD to get lost has been fixed, and the
workaround for it can now cause Emacs to abort.
Fixes: debbugs:13192
Joakim Verona [Mon, 17 Dec 2012 16:01:39 +0000 (17:01 +0100)]
auto upstream
Kevin Ryde [Mon, 17 Dec 2012 15:51:49 +0000 (10:51 -0500)]
* lisp/files.el (auto-save-file-name-p): Use \` and \'.
Fixes: debbugs:13186
Joakim Verona [Mon, 17 Dec 2012 14:46:08 +0000 (15:46 +0100)]
auto upstream
Michael Albinus [Mon, 17 Dec 2012 14:38:07 +0000 (15:38 +0100)]
Add support for preserving ACL entries of files.
* net/tramp.el (tramp-file-name-for-operation): Add `file-acl' and
`set-file-acl' handlers.
* net/tramp-adb.el (tramp-adb-handle-copy-file): Handle
PRESERVE-EXTENDED-ATTRIBUTES.
* net/tramp-compat.el (tramp-compat-copy-file): Handle
PRESERVE-EXTENDED-ATTRIBUTES.
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Add
`file-acl' and `set-file-acl' handlers.
(tramp-gvfs-handle-copy-file): Handle
PRESERVE-EXTENDED-ATTRIBUTES.
(tramp-gvfs-handle-file-acl, tramp-gvfs-handle-set-file-acl): New
defuns.
* net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add
`file-acl' and `set-file-acl' handlers.
(tramp-remote-acl-p, tramp-sh-handle-file-acl)
(tramp-sh-handle-set-file-acl): New defuns.
(tramp-sh-handle-copy-file, tramp-do-copy-or-rename-file): Handle
PRESERVE-EXTENDED-ATTRIBUTES.
* net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
`file-acl' and `set-file-acl' handlers.
(tramp-smb-handle-copy-file): Handle PRESERVE-EXTENDED-ATTRIBUTES.
Joakim Verona [Mon, 17 Dec 2012 11:26:38 +0000 (12:26 +0100)]
auto upstream
Glenn Morris [Mon, 17 Dec 2012 11:17:34 +0000 (06:17 -0500)]
Auto-commit of generated files.
Joakim Verona [Mon, 17 Dec 2012 08:00:58 +0000 (09:00 +0100)]
auto upstream
Kelly Dean [Mon, 17 Dec 2012 07:54:57 +0000 (08:54 +0100)]
Fix some interactions of make-help-screen and other Help forms (Bug#13190).
* help-macro.el (make-help-screen): Instead of switch-to-buffer
use pop-to-buffer with NORECORD argument t. As buffer name use
*Metahelp* with a leading space (Bug#13190).
Joakim Verona [Sun, 16 Dec 2012 22:56:58 +0000 (23:56 +0100)]
auto upstream
Paul Eggert [Sun, 16 Dec 2012 22:53:28 +0000 (14:53 -0800)]
* sysdep.c (emacs_abort): Bump backtrace size to 40.
Companion to the 2012-09-30 patch. Suggested by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00796.html>.
Paul Eggert [Sun, 16 Dec 2012 22:51:03 +0000 (14:51 -0800)]
* calc.texi (ISO 8601): Rename from ISO-8601,
as it's typically spelled without a hyphen.
Joakim Verona [Sun, 16 Dec 2012 18:34:29 +0000 (19:34 +0100)]
auto upstream
Romain Francoise [Sun, 16 Dec 2012 18:22:27 +0000 (19:22 +0100)]
Add support for preserving ACL entries of files.
* configure.ac (acl): New option.
(HAVE_POSIX_ACL): Test for POSIX ACL support. This is typically
provided by libacl on GNU/Linux.
* fileio.c (Ffile_acl, Fset_file_acl): New functions.
(Fcopy_file): Change last arg to `preserve_extended_attributes'
and copy ACL entries of file in addition to SELinux context if
set.
(syms_of_fileio): Add `file-acl' and `set-file-acl'.
* Makefile.in (LIBACL_LIBS): New macro.
(LIBES): Use it.
* files.el (file-extended-attributes)
(set-file-extended-attributes): New functions.
(backup-buffer): Use them to handle both SELinux context and ACL
entries.
(backup-buffer-copy): Work with an alist of extended attributes,
rather than an SELinux context.
(basic-save-buffer-2): Ditto.
* files.texi (File Attributes): Document ACL support and new
`file-acl' function.
(Changing Files): Mention argument name change of `copy-file' and
document new function `set-file-acl'.
Glenn Morris [Sun, 16 Dec 2012 12:19:49 +0000 (07:19 -0500)]
Auto-commit of generated files.
Glenn Morris [Sun, 16 Dec 2012 11:22:07 +0000 (06:22 -0500)]
Auto-commit of loaddefs files.
Joakim Verona [Sun, 16 Dec 2012 03:26:54 +0000 (04:26 +0100)]
auto upstream
Timo Myyrä [Sun, 16 Dec 2012 03:17:50 +0000 (11:17 +0800)]
* battery.el (battery-bsd-apm): New function.
Joakim Verona [Sun, 16 Dec 2012 03:02:08 +0000 (04:02 +0100)]
auto upstream
Jay Belanger [Sun, 16 Dec 2012 02:52:11 +0000 (20:52 -0600)]
* calc/calc.el (calc-standard-date-formats): Adjust one of the
standard date formats.
Joakim Verona [Sun, 16 Dec 2012 02:17:05 +0000 (03:17 +0100)]
auto upstream
Jay Belanger [Sun, 16 Dec 2012 02:07:30 +0000 (20:07 -0600)]
* doc/misc/calc.texi (ISO-8601): New section.
(Date Formatting Codes): Mention new codes.
(Standard Date Formats): Mention new formats.
Joakim Verona [Sat, 15 Dec 2012 15:42:10 +0000 (16:42 +0100)]
auto upstream
Paul Eggert [Sat, 15 Dec 2012 15:33:43 +0000 (07:33 -0800)]
* fileio.c (internal_delete_file): Use bool for boolean.
Chong Yidong [Sat, 15 Dec 2012 14:16:02 +0000 (22:16 +0800)]
Bump version to 24.2.91.
Regenerate ldefs-boot.el and AUTHORS.